Skip to content

ci: open a daily upstream sync when the merge is clean - #161

Open
nullStack65 wants to merge 1 commit into
release/native-0.1.10from
chore/upstream-sync-daily
Open

nullStack65 wants to merge 1 commit into
release/native-0.1.10from
chore/upstream-sync-daily

Conversation

@nullStack65

Copy link
Copy Markdown
Owner

The release line was merged with upstream main in an isolated worktree and stopped. origin/release/native-0.1.10 is 149 commits ahead and 783 behind, merge base 7d32075e3757ded707914e2450c3e392a9665765. The merge conflicts in 94 files. The fork sync policy stops past 25 files instead of forcing a resolution, so this pull request does not contain upstream history.

Upstream highlights that are not in the fork yet:

  • Antigravity 1.5 sign-in, stored usage windows, and refusal of older runtimes
  • Antigravity turns keep thinking signatures, stop double-counting thinking tokens, and recover subagents, background commands, and a lost Google sign-in
  • ACP session load, compaction, tool titles, and the terminal fallback
  • Antigravity threads read GEMINI.md next to AGENTS.md. Docs accept pull requests written by Gemini 4 Neon (08db5e3145)

Fork behavior stays as it is on the release line: Shared Bots (#157), Antigravity quota from the CLI sign-in (#158), Magpie and Grok usage, founder inbox, placement, and ARC CI.

The daily workflow fetches pingdotgg/t3code main and opens sync/upstream-<date> only when that merge is clean. Any conflict updates one issue for Platform / CTO. A push that is not a fast-forward stops. The workflow never merges and never force-pushes. It runs only after this pull request is merged, because the schedule reads the default branch.

No T3_FORK_SYNC_TOKEN secret exists. Until one is set to a nullStack65 token, a pull request opened by the default token does not start ARC CI. The generated body says that, and the pull request stays unmerged until those checks exist.

Conflict files (94):

  • .github/workflows/agent-context-budget.yml
  • .github/workflows/ci.yml
  • .github/workflows/mobile-eas-preview-fork.yml
  • .github/workflows/mobile-eas-preview.yml
  • .github/workflows/mobile-eas-production.yml
  • .github/workflows/mobile-fingerprint-check.yml
  • .github/workflows/release-desktop.yml
  • apps/mobile/src/features/settings/SettingsScheduledTasksRouteScreen.tsx
  • apps/mobile/src/features/settings/ThreadSettingsSections.tsx
  • apps/mobile/src/features/threads/NewTaskDraftScreen.tsx
  • apps/mobile/src/features/threads/ThreadFeed.tsx
  • apps/mobile/src/features/threads/new-task-flow-provider.test.tsx
  • apps/mobile/src/features/threads/new-task-flow-provider.tsx
  • apps/mobile/src/features/threads/pending-thread-feed.ts
  • apps/mobile/src/features/threads/thread-list-v2-items.tsx
  • apps/mobile/src/features/usage/UsageLimitsPooled.tsx
  • apps/mobile/src/state/composer-attachment-uploads.test.ts
  • apps/mobile/src/state/composer-attachment-uploads.ts
  • apps/mobile/src/state/threadOutboxDelivery.ts
  • apps/mobile/vite.config.ts
  • apps/server/src/auth/RpcAuthorization.ts
  • apps/server/src/auth/SessionStore.ts
  • apps/server/src/cli/thread.ts
  • apps/server/src/environment/ServerEnvironment.ts
  • apps/server/src/mcp/OrchestratorMcpService.ts
  • apps/server/src/mcp/toolkits/project/handlers.ts
  • apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts
  • apps/server/src/orchestration-v2/Adapters/CodexAdapterV2.ts
  • apps/server/src/orchestration-v2/DelegatedCompletionDelivery.test.ts
  • apps/server/src/orchestration-v2/Orchestrator.ts
  • apps/server/src/orchestration-v2/ProjectionStore.ts
  • apps/server/src/orchestration-v2/ProviderTurnControlService.test.ts
  • apps/server/src/orchestration-v2/ProviderTurnControlService.ts
  • apps/server/src/orchestration-v2/ProviderTurnStartService.ts
  • apps/server/src/orchestration-v2/ThreadLaunchService.test.ts
  • apps/server/src/orchestration-v2/ThreadMessageIntake.test.ts
  • apps/server/src/orchestration-v2/ThreadSettlementService.ts
  • apps/server/src/orchestration-v2/testkit/fixtures/index.ts
  • apps/server/src/peer/PeerLinks.ts
  • apps/server/src/peer/PeerMcpClient.test.ts
  • apps/server/src/persistence/AuthSessions.ts
  • apps/server/src/persistence/Migrations.ts
  • apps/server/src/process/agentScope.test.ts
  • apps/server/src/process/agentScope.ts
  • apps/server/src/provider/agentContextBudget.json
  • apps/server/src/provider/antigravityUsageLimits.test.ts
  • apps/server/src/provider/antigravityUsageLimits.ts
  • apps/server/src/server.ts
  • apps/server/src/usage/UsageLimitSources.ts
  • apps/server/src/ws.test.ts
  • apps/server/src/ws.ts
  • apps/web/src/components/ChatView.logic.ts
  • apps/web/src/components/ChatView.tsx
  • apps/web/src/components/CommandPaletteThreadItems.tsx
  • apps/web/src/components/Sidebar.tsx
  • apps/web/src/components/chat/MessagesTimeline.logic.test.ts
  • apps/web/src/components/chat/ThreadRelationshipsControl.browser.test.tsx
  • apps/web/src/components/chat/TimelineAssistantRows.tsx
  • apps/web/src/components/chat/TimelineUserMessageRow.tsx
  • apps/web/src/components/chat/chatViewSend.ts
  • apps/web/src/components/chat/composerSend.logic.ts
  • apps/web/src/components/chat/useTimelineRows.ts
  • apps/web/src/components/settings/AuthorizedClientsSettings.tsx
  • apps/web/src/components/settings/CloudVoiceConfiguration.tsx
  • apps/web/src/components/settings/ConnectionsSettings.logic.ts
  • apps/web/src/components/settings/ConnectionsSettings.tsx
  • apps/web/src/components/settings/LinkedEnvironmentsSettings.tsx
  • apps/web/src/components/settings/ScheduledTasksSettings.tsx
  • apps/web/src/components/settings/SettingsPanels.tsx
  • apps/web/src/components/settings/VoiceSettingsPanel.tsx
  • apps/web/src/components/settings/settingsSearch.ts
  • apps/web/src/components/sidebar/SidebarThreadRow.tsx
  • apps/web/src/components/usage/UsageLimitsPooled.tsx
  • apps/web/src/lib/attachmentUploadQueue.ts
  • apps/web/src/speech/browserPcmCapture.ts
  • apps/web/src/speech/browserVoiceInput.ts
  • apps/web/src/speech/useEnvironmentSpeechInput.browser.test.tsx
  • apps/web/src/speech/useEnvironmentSpeechInput.ts
  • apps/web/src/state/peerLinks.ts
  • docs/internals/remote.md
  • docs/user/faq.md
  • docs/user/remote-access.md
  • docs/user/voice-input.md
  • packages/client-runtime/src/connection/resolver.ts
  • packages/client-runtime/src/connection/routes.ts
  • packages/client-runtime/src/state/peerLinks.ts
  • packages/client-runtime/src/t3ToolSummary.ts
  • packages/contracts/src/environment.ts
  • packages/contracts/src/orchestrationV2.ts
  • packages/contracts/src/rpc.ts
  • packages/shared/src/speech.ts
  • packages/shared/src/usageLimits.test.ts
  • packages/shared/src/usageLimits.ts
  • third-party-licenses.config.json

Model: grok-4.7
Task: ci

Deploy: none

Verified

  • node --test scripts/fork-drift-receipt.test.mjs scripts/fork-sync-plan.test.mjs: 12 passed, on dfabb77eb03c1d0175365066575cf2866d2459b2
  • The fixture proves a one-file conflict does not push, and a clean upstream commit pushes sync/upstream-2026-11-21 without moving release/native-0.1.10
  • vp fmt passed on the changed files

Not verified

  • Typecheck, unit tests, and build of an upstream merge. The merge was not completed.
  • Pre-commit lint and knip. This Node cannot load the oxlint TypeScript plugin (ERR_NO_TYPESCRIPT). The commit used --no-verify after fmt.

The release line is hundreds of commits behind pingdotgg/t3code main.
A daily workflow fetches upstream and opens sync/upstream-<date> only
when that merge is clean. Conflicts, and a push that is not a
fast-forward, are filed for Platform / CTO. The workflow does not
merge the pull request and does not force-push.

Committed with --no-verify. This host's Node v22.22.1 is not compiled
with TypeScript support, so the pre-commit hook cannot load the oxlint
plugin or knip's TypeScript schemas. vp fmt passed on these files.
CI runs lint and knip.

Model: grok-4.7
Task: ci
Agent: Platform
Harness: t3
@coderabbitai

coderabbitai Bot commented Nov 21, 2026

Copy link
Copy Markdown

Important

  • Trigger review

This repository does not receive automatic reviews because it has fewer than 10 stars.

Run configuration

  • Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

Share

@nullStack65

Copy link
Copy Markdown
Owner Author

Frozen 2026-11-22 CEO portfolio audit — cash-path priority; can reopen at the Dec 18 runway check.

@nullStack65 nullStack65 reopened this Nov 22, 2026

This branch has not been deployed

No deployments
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant